Inhibit mouse-avoidance if cursor-type is nil (Bug#8209).

* lisp/avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
`cursor-type' is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59ff13a81456996e6f0409070cdf6741989f0b87..901bdaee2b1b6bb2f781945b71e10da1e0541afe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-10  Julien Danjou  <julien@danjou.info>
+
+       * avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
+       `cursor-type' is nil.
+
 2011-03-09  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc.el (calc-mode-map): Don't bind "C-_" to `calc-missing-key'.

diff --git a/lisp/avoid.el b/lisp/avoid.el
index fe47a0c4a3370e895dd22e6f0040f19ff8407233..c864d48e9cee12ddeb760c41a609935cd9933fd1 100644 (file)
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -278,6 +278,7 @@ redefine this function to suit your own tastes."
 (defun mouse-avoidance-ignore-p ()
   (let ((mp (mouse-position)))
     (or (not (frame-pointer-visible-p)) ; The pointer is hidden
+        (not cursor-type)               ; There's no cursor
         executing-kbd-macro           ; don't check inside macro
        (null (cadr mp))               ; don't move unless in an Emacs frame
        (not (eq (car mp) (selected-frame)))